Added concept of checkins
Merge