Merge pull request #232 from SGA-Brookshire/master

first pass
first pass e2 16 and 18