Added support for additional waypoints
the holy static version
Locus integration - first version