Add all class files accessors and some algorithm work