Pushin' a whole lotta stuff.  Expect horrible commit messages for a while as I iron things out.