Got DirectGoal refactor working