Work for sprint 1. Master Issue is #14
Work for sprint 1. Master Issue is #14