Continued work on Inn/Stores