Getting ready for pypi packaging
Not even close to cleaning up the code