Still working on shelling out classes