wrap all the things in BACON!!

Change-Id: I93fab841a7542d2223efa470b17fe1b1243d079e
remove use of NavRinHelpers

Change-Id: I2b971525e0a7708a83f7acc94ba96a26cb8c3dba