Points along route sort of working
Zoom fix?
merge conficts fixed
Merge branch 'pointsOnRoute'
more merge confict resolution