WIP getting subst right