Lots of refactoring done on the FluxMap, not finished yet just a mid point save
All cases done - circular path function needs checking