refs #1654: work in progress