Refactoring etc, fluidstorage