initial checkin - with a lot of todo's