Adding in several classes and changes