rejigged methods between class files