Refactored and rewrote authority
;;
Conflict handled