Ugh, this is a remnant of approach number 3 spiked, should've been better at branching. Removing