Started implementing more buddy commands