Added event creation functionality. Router cleaned up a bit