Added second handler Winder, split to separate layer, some cleanup.