Planned goals and refactor fest