Pretty Much Done

I think that's pretty much it. There'll be a few changes for sure but
that's really all there is left. Just some cleanup once everything is
done