Iteration 3

This should finalize all of Iteration 3... I'm going to merge the pull request but just making it for archival purposes.