working on performing substitutions
basic dev case working