Begin refactor to mostly content script