basically the first real commit for the events module
big merge