Recreating Test map functionality. Needs love

Hackily moving things around in testmap and reconfiguring stuf