control_rules are now centrally stored in controlled Analysis object; -wait_for rule added for testing