Viewer - add map

This is ongoing work.

Still more to come, thus no ready to merge yet.