Added class files that fix things