moar consistency
moving storage function out of grid