continuing poller.py revamp