John Deasy (Waterford, Fine Gael) | Oireachtas source

So the answer is "Yes". There is a bit of work to be done. Mr. Lavery has acknowledged there have been problems with the administration of this since the beginning.