Tied up loose ends and moved the functionality. Fixed API for first time check-in.