assignment 1 --- 7th commit

Seems to be working, awaiting feedback before submission.