Integrating classes

fixes all merge conflicts