Finished NPC and NPCRegistry
Start work on citizens implementation