Begin refactor to mostly content script
slight manifest tweaks
Finish content script refactor