Almost done working on allowing for multiple classes