persisting prefs and passing blocking info to add-on, still need to finish blocking implementation
persisting prefs and passing blocking info to add-on, still need to finish blocking implementation
blocking is working
resolving merge conflict
revise from earlier merge conflict