Buddy system in play

The buddy system is now active