Improve partial
Uncomment test
Refactor untuple
Tweak some more
Partial refactor
pass function as reference