Initial move towards a two pane refactor