Interim checkin: migrating existing code into repo