Added option to give Waypoints a name that can be used for some commands
The code is somewhat messy and is untested!