polling

@MitchK this is a first proposed step to switch to polling. please check and merge