adding classes [almost done]