First Draft of Paper and Cleanup

Cleaning up some of the code for submission