Filling out more classes