working on code clean up and rerouting of python stuff