Collections & maps

Please don't merge this. I just want Jenkins to produce artifacts for me.