premerge
Added helper code for friend relationships
Still crash and burn-y but it's getting there