refs #5 This needs a test case.  And it needs some more testing.