Going to try one more thing, then will rewrite history to clean up this stuff