Final Project TODOs

Stage 1: Cleanup

Stage 2: Putting it Together