doing a massive merging of an old code base and a new one cursor + opus 4.6 planned a 25 step to do list, 5 different parts, a and b my past self wouldn't believe it