Upgraded to 4.0. WIP on map routing