Checkpoint before i break everything
Refactored