Updated 3.2 with re-ordered use cases (by priority with grouping) -- still needs renumbering