rewording a bit of the intro and continuing the v2 refactor