very buggy storage strategy, about to try something else