Initial work on upcoming event builder