CS 1699 Deliverable 3