Merge of Noahs first commit

Get used to the pull request workflow and comments
Looks like the indentation is not uniform throughout that elif.. please fix if thats the case