get rid of coffee, split classes out