Refactoring code to allow for continual adding to the store