Working everything, including substitutions