Fixed poll, refactored nml/poll to be its own file.