Interim check-in. Adding reverse support to ui