Move over to bops from buffer-tools