More quantisation prep
I don't know what I'm doind :( This works, but it's messy