"classes_by_target" should go away essentially
# general
w
"classes_by_target" should go away essentially