refactored the targeting portion and cleaned it up.