working on tidy storage, added flux conservation