WIP outline refactor