split classes a little more...