Completion of Assignment 2

I did it, I think.