FInal commit
For Submission on Friday 10/12