** Temp commit adding expression resolver