Commit2

Finished base project. Extra credit left.