Tristan has submit split

don't merge yet