part 2 of the partial commit.

Compiles now.
I knew what I was doing. I just didn't feel like going to bed at 2am. I
do still have school.