Pull Request for Project 1

@andrewberls
~requested: 600