Ok, yeah. I'll move it. There's a lot more work that needs to be done to make this file robust. But I'll work on some continued refactoring.