Merge pull request #229 from SGA-Brookshire/master

first pass e2-0007
first pass e2-0008