Deliverable 1 basic complete

Completed basic deliverable 1