Implement trivial substitution case

Simple first pass to figure out some more go. Lots of holes to be filled
in before this is not full of bugs.