Actual Map Integration

The beauty was a lie (but now it's real)