Dealer class created + other changes