New function, new test.
Coupla FIXMEs.