Deliverable3

Deliverable 3 now has all complete functionality! // TODO - add comments. Maybe.