Return intent from add/remove-conduct
Add docstrings