A few more functions, a few more tests.