One step further down into the refactor