Intermediary checkin

Squash this