Begin converting things to use the new Event structure