Added Event TODOs and struct