Added Checkpoints
Basic Functionality
Resolved Conflict