Class switching now working and fixed