Variable substitution work in progress