refs #1649
TODO - tests