Continued work to get a generic store creator happening