CS1699 Deliverable 2 - Valentin & Neha