More changes to get the class list working right