Update and FYI.
3 weeks ago I had applied for a change of visa. I was to go from visa exempt to non o.
Today was the day that i got my result and my visa exempt got changed to a non o visa based on marriage.
This was done at Samut Prakan.
Arrived early and handed over my passport at 8:30.
2 hours later I have a stamp in my passport which allows me to stay until September 3rd.
No questions asked, no other paper work needed. Just a comfortable chair and plenty of charge on my phone.