Revert "Base Addons"

This reverts commit b70f053d634527bdb26282876a2b0067882c15ca.
Revert "Revert "Base Addons""

This reverts commit 17aa912d87d8534cc70748f832358bf2c536a137.