@Colin ********
IF you're still on that 90 day Non-O visa based on marriage to a thai that you got before you came to thailand, you have THREE choices:
1 - Apply for a year extension for 1900baht BEFORE your current 90 day stamp runs out by meeting the proof of funds of 400K baht in a thai bank account in your name only for 2 months before you apply and by supplying the documentation require
2 - Apply for the 60 day visit thai family extension for 1900baht BEFORE your current 90 day stamp runs out. This extension does NOT require proof of funds and only minimal documentation
3 - Do nothing, take the free amnesty until no longer than July 31st and watch the news for the borders re-opening and the announcement for what amnesty holders do when that happens.