Rewrote smash up with classes instead of unrealted vaiables