Add names hashtables. wip.