A little closer to note-based CV outs after that last big inverting refactor