Close to finalized project 2.

We believe we are finished, all that is left is cleaning and commenting!