merging: add latest state of trailer rework

- on for merging, it's nit finished