Note to self- Always check your stamp immediately at immigration!!!

Thanks everyone for the quick input! So yes- UPDATE: Went to immigration- and basically have to leave and come back in on my Non-O or pay $1900 to up my tourist visa an additional 30 days. Luckily, scheduled to leave TH anyway for a quick trip, so can come back in on the Non-O when I get back and then that visa will start from that return date. I appreciate everyone's input.

@Tatiana *******

yes- my son's in an ED- single entry- and my non-O attached to his is a multi entry- We need to travel back and forth for work to the philippines next month- so I purchased the multi- entry- but could not do so for my son on an Ed visa. not sure - but I think at this point- I will be charged to switch over to tourist.

@Tatiana *******

mine is multi entry

Thank you for your response!! The Thai embassy emailed me a letter to print off. This is what I showed the officer at entry. She reviewed our letters, then stamped and waived us through. Flew into BKK now in Phuket- have immigration appt. here- for day 45. Will they make me pay to extend on a tourist? and then I will have to go to BKK to sort?