Add map capabilites. Engine needs cleaning up.