[WIP] Try merging trips