Work on Wines controller and general helpers