@Nathan **********
&
@James *******
you can apply for the initial 90 day Non-O visa based on marriage to a thai if you meet the proof of funds, if you have enough time left on your entry stamp (most offices require 15 days or more left on your current stamp)
AND
If the immigration office where you live can issue in country visas (not every office can do it)
So check with the immigration office that serves the area where you live to see if they can or can't issue in country Non-Imm visas at that location