They were individual commits. >_> Until I squashed them all by mistake.

I'll try and make 2 separate commits.