Thanks to the major tip from @HinrichNose about the selcal structure I'm currently testing new code.
The past code had major pre-filtering and I have taken that out, so getting some funky stuff at the moment, but it should be worth the testing pain.
Once I get it dialed, let me know if it has value.