Partial passing one test
Merge branch 'master' into partial
Partial passing two tests
Improve partial
Uncomment test
Refactor untuple
Tweak some more
Partial refactor
pass function as reference