refs #1767 - checking in progress so far. On/ off functioning now end to end, time to roll in additional features.