Finished Assignment 12

Forgot to commit changes, and finalization of assignment 12.