Complete Flux Refactor