wip
wip -- fixup tests
wip -- fixup trans
wip -- last few changes