initial checkin
fixed compile errors
fixed compile errors