add ids to waypoint
move tour to models.py