Refactoring stuff and creating stores cruf