[wip] Work on verticals refactor [ci skip]