Complete Refactor
Refactor Updates