Integrating changes

Adding work I did for integrating classes