Moving the files all over from bitbucket and reverting to the pre-py3k port (which doesn't work)