Fixed issue where classes could vary
pushing the rest of my work