WIP a small amount of py3 support