working on store generation
imporovements to store generator