Interim commit - server poll first pass...