WIP: Poll

Change-Id: I7c2af7e983a3a87d9125eb4a742e85557f60de62