Working on getting the Flux pieces in place