Fuck this, check the diff. Hopefully last commit ever.