Problem 2 commit

Finished!