setup trip adding and deleting
Made some progress
merging