Fix capitalization
Working on substitution.
Substitution works now.