incremental checkin, this is closer to working