first pass e2-0010
Merge pull request #231 from SGA-Brookshire/master

first pass e2-0010