tests passing
Merge branch 'er_finalhours' into development