Implement timestamps into events
Overall just fix NPE from bad call