@Mike Myers looking through this diff, there's quite a few things that could stand updates. I'm going to leave a review on this, but definitely don't feel like you need to do all of the updates, I'm happy to take over fixing a lot of this shit.

Ok, if you want, open an issue to refactor it more. But with your review, I can make the immediate changes.