first checkin
tidy up