Deliverable 3 for CS1699