initial checkin (with probable bugs)