Added npcs grid and converted some more of the static data object