Change code from using instants to event time

[c-git]

This will make the code a bit more complicated but will allow us to replay the events for debugging