Make a start on a headline refactor