Getting there, split classes out