1st working version w/ checkins