fix how event get created
don't deal with gateways directly from here anymore