OK - maybe need the class in separate file then