Map parts and wips (pt 2)