Crap ton of changes, should have made more microcommits.  Whoops.  Seems to be working.