Move events out into it's own file