Using the correct list for waypoints now.
Index all the Things.
Implemented deletion (not so much tested yet).