Adding plan, refactoring other parts of shop