Assignment 2 Complete

As done as it's going to get for now.