Added Notes to groups and refactored client notes