refactored targeting to set up for targeting into properties
a bit more refactoring for targeting list (getting ready to recursively add things to targeting)