Merge of Noahs first commit

Get used to the pull request workflow and comments
May want to indent this here for clarity that its a continuation of the above function