Continue plugin-bridge rework
More plugin-bridge work
More of the same