Since Michael Phelps is done with his events, will he still be around the Water Cube or what?

Oh I am sure he will stick around to cheer on team USA, and not just in the water cube either. Hes known for being a genuinely good guy, and id have a really hard time believing hed head back to the states just because hes done competing.