first pass e2-44, 45, 46, 48, 49, 50 djb
Merge pull request #254 from SGA-Brookshire/master

first pass e2-44, 45, 46, 48, 49, 50 djb