unit tests pass
Merge branch 'exp'
COVERAGE FILES YOU ANGER ME