Made... lots of changes.

I realize I should have done MUCH smaller commits.