Okay, I have a plan to make this more readable. Please hold off on merge for a bit...