Final submission

The state of the code on the due date. Many of the extras have been implemented and the API as a whole is complete and consistent.