Final for sprint 1

Get this version for sprint 1