Work on the v3 core refactor