I was THINKING of ordering this into logical commits.

I couldn't be fucked.