lots of additions, still can only add one set of classes though...