Content scripts 2.0

WIP