Added rudimentary waypoints (That currently use the "shit" tag).