progress on getting persistent dictionary out of env. Not yet done. Need to make sure all references to it are in a single place