The polling stuff was done by Gregadeaux - he's awesome

@Gregadeaux Can you look over this? :)