Big ol' commit

Sorry for all the changes. Lots happenin and under pressure.

You're a wizard, Harry.