Major Refactor Shop Classes