also - this method *really* needs a unit test.