All finished and cleanup

Completed remainder of assignment, and cleaned up any remaining debug or
unnecessary code.