Added map viewing support. Yay :D