map functional. added models including waypoint model. waypoints are saved with relationship with journey