Had to roll back because idea for classes didnt work