Started Python3 rewrite, cleaned up a few things, rather than have two files I'm condensing it down to one file with a couple of classes.