Final commit before due

Cleaned up everything, and tested.