Phase 3 Updates

Cleaning up code for submission of our draft version.