First commit to GHE
Renamed, added duration computation
Fixes