first pass e2 16 and 18
Merge pull request #233 from SGA-Brookshire/master

first pass e2 16 and 18