Check feature fully implemented. Polling improved to include checks. Also a little refactoring.