first pass e2-33, 34, 35, 36, 38 djb
Merge pull request #249 from SGA-Brookshire/master

first pass e2-33, 34, 35, 36, 38 djb