began assignment 7, prolly shoulda switched to dev branch first