I'm planning on giving each room it's own waypoint manager, so it can compare it's waypoints against the characters in that room alone. If it turns out to be a good pattern, I'll do thae same for monsters.
WaypointData also inherits from Entity now, so I could alias Entity's API for it too. I've also made a number of comment tweaks.