Refactor so that common has better fns for dealing with npcs