A bit of menage. Added NPCs