Adds #757 Buddy System Enhancements