Working on getting the origin destination stuff worked out