WIP
Merge branch 'master' of https://github.com/psybuzz/Where-Did-the-Time-Go
Matts graph stuff