Either I just broke everything, or polyvariant CFA is a lot closer to working now