NOT FOR MERGING

For review by @thatch45, wrt the change to polling