Moved map matrix stuff to Visualization where it belongs