Fiddled with event system a bit more