First pass at Addons / getting ready for multiprotocol support.