Initial commit of deliverable 2