Event system 2.0

Had some problems with syncing commits, so it this one looks someow
wierd -> that's why