again with the class files, see previous commit for current changes