Updated checkin and todo