Added npc-controller facade
Merge