Checking in before I break too much more stuff.