First commit of sprint 1