semi working store version here
making it more store like.