WIP events controller for new schema