more Retrieval poller/eventsource work