Move this block, add better failure handling