Starting to work on buddy selection