I was thinking about something on that line: would be easier to unit test it.