Adding classes [untested]