Good Luck...
Follow your plan at MTT.
And YES you will need a TM 30 filed for your current address.
And have you already obtained the 30 days extension from your visa exempt entry of 30 days?
If not...most likely the immigration officer will only grant you the 30 days.
If you can get an appointment
Do it.
It appears from an earlier post you arrived November 26th
So you already have obtained your 30 day extension.
****************************************************************************
**********
**********
*****
*****
*****
3/permalink/
*****
*****
*****
7/
And
@Benjamin *****
posted how to obtain the COVID extension
**************************************************************************
**********
**********
*****
*****
*****
3/permalink/
*****
*****
*****
6/
Good Luck.