Final commit for sprint 1 - Chris