Final changes to functionality
Readying for grading