Added eventhandler starter and move things around to make it more flexable