Reorganized
Added polyline reduction
Removed FIXME
Reduce trip before saving