branches 95% the way there, one bug when editing segments