Re-write for latest version of chrome && manifest v2