Remainder of class files initial push