moving storage out to files + allow refetch of number data