Progress on Event Generation

TODO:  Finish time generation