WIP to try to get this working with Python 3.3