I'm continuing my refactor. It's getting close to done. I just need to save myself from getting too ambitious with it.