adding stored; lots of little changes in support of it