[wip] Work on vertical refactor [ci skip]