Atv flash and future of mkv

Hi guys,
I am in a dilema now. My plan was to keep my old Appletv for renting itunes movies and buying a boxee box in order to stream all my NAS files like divx and mkv files.
Now I see the progress made by the team and I am thinking about just buying the new AppleTV and the atv flash...
I know this is just the beta and streaming from NAS isn't working yet, but this seems to be one of the main goals.
My question would be if you think that mkv would be one of the compatible formats and if the new AppleTV is powerfull enough to play 720p or 1080p movies as .mkv?
Hope somebody can help... Because if the answer would be yes, I could save a lot of money by NOT buying the boxee box...

yes i think it will, actually, let me check if plex is already able to play mkvs...

ok, yes PLEX can already play mkv files.

Yes I know, but I don't want to keep my imac on all the time so i hoped that the mkv streaming straight from NAS will come....

When you say it will: 720 or 1080?

Would the atv basically be able to play 1080p?

the one i have is only 720p i dont know if it is capable of 1080p