Finished tags. OMG that update trip with tags is fucking hard!
merged conflicts