Finished the assignment

This was tough!