re-organize in prep for adding rules and targets