[WIP] more fussing with target classes