I think I'll start focusing on other aspects of the codebase for now, so why not merge these changes?