Finished project 1

@jcneally We finished issue #1 and issue #2

~requested: 700