CCL's changes

These include Mike's changes to handle hierarchical WQ.