moved wiper code into class