An intermediate checkin. There's still a lot of old code to be refactored,