Moving store in to its own class.