Pre-refactor checkin

Checking in a lot of working (or partially working) updates before a
refactor.