super mega refactor/testing/py3