Refactored
Still refactoring store