Finally got it to safely restart! Committing now before I screw it up. Cleanup to follow.
Cleaned up a lot of the code I've written recently.
Eliminated a bunch of debuggin stuff.
More cleanup.