TODOs on gateways