Poller - don't merge yet

Be prepared to hate my code.

- [ ] @mikesherov 
- [ ] @Aintaer 
- [ ] @Attamusc