first stab at moving name resolution to the approproate places