Add other npc's as possible guard targets

All previous commits baked into one.  It is much tidier this way, I hope there isn't any reason why I shouldn't have done this...