Made some changes to checkIn. WIP