Pulled out map stuff. Bit of a hack