Fixed scope errors. Basic add-on ready.