Refactor checkin creation
Selector is too brittle