Refactored many to closure magic unit
Refactored one to closure magic unit
Refactored everything into magic closures