Bleeding edge

lot more cleanup on targetting