added some events, still work in progress...