WIP still debugging, see errors in quicktest.py
WIP looks good