Changed around stuff & added EventHandler :)