Ongoing directions refactor