Started actually using the poller, which meant tweaking the API here