Final version with revisions for sprint 2, ready to go