Whoops.  Needs more tests.