Breaks all kinds of things. Going to revert. I have no idea why the existing code works so well but any touching it to make it more reasonable regresses the results :(.