code review complete.  need to fix polling