Continue overhaul add Store class