First pass at SSEs for #78
Merge branch 'issue-78' into develop