Add note to todo log when doing a branch switch in a preserve merge
Rework rewriting logic
Start at handling multiple branches as inputs. Non functional
Almost working (for some definition of working)