first pass e2-55 and 56 djb
Merge pull request #261 from SGA-Brookshire/master

first pass e2-55 and 56 djb