This pull request already has about 30 different improvements to various files and features throughout our codebase. At this point, I just want to get it merged without more stuff being piled on top.