first pass e2 21, 22, 26 djb
Merge pull request #239 from SGA-Brookshire/master

first pass e2 21, 22, 26 djb