WIP #757 Buddy System Enhancements

Discarding some files.