This would've been multiple commits, but I kept forgetting to ACTUALLY commit things. Changes logged in the PR.