I would like to associate a diagram with a class operation. I am currently using build 766. If there is a way to associate a diagram with a class operation and have all elements be contained by the class operation, I havn't found it. Here is an example of a class with only one operation added.

I was wanting to associate an activity diagram with the operation DisplayMetricGraphs, but was unable to. I can associate a diagram with the class though. But this seems to leave the project looking like my garage. All attributes, operations, diagrams, and diagram entities are at the same level, and intermixed based on sort order. This is more of what I was expecting...

Here, the diagram and its entities are contained in the operation (ignore the sort order, I wasn't paying attention when slicing/dicing the original image). If I don't want to see them, I just collapse the operation node.
I know this has been suggested in the past, atleast a year ago. If this is possible, please tell me how. Also, what are some other organizational techniques you guys use?