Assignment 2 Complete

Didn't quite figure out everything. Will return to it, as well as the
extra credit later.