Justin's Submission

Sorry for the large changes in 2 commits.. still not used to doing it for such small increments