Add time and replay ability
Streamline some model transformations and make messages better