In working state with embedded updates, major bridge stack refactor in progress