Integrating classes and updating to python 3