UP: Got new classes working