Refactoring Checkin Module

Tests still not passing