Some comment on this classes purpose would be good, as the reasoning behind it isn't clear on first sight IMO. Also could it be made private?