Checking in some changes before starting some risky overhauls