added targeting module, and started to refactor matching on the minion side