Updated version 1, need to go back over version 2 with changes to main in version 1 and updated with files in class today