Outline plan for refactor