WIP #757 Buddy System Enhancements