Fixed bug with default event times, improved the code too
* Next will investigate using the bundled state.