Returned to the old method of targeting.
Possibly needs work, having to deal with other errors before I can test.