Alright, I'll try and do it all in the same PR then.