Add sub-panorama and some broken routing
Add routing