Refs #283 - Implement. Full test needed.