WIP Feature/horizontal refactor