Started to implement https://github.com/rec/echomesh/issues/479 and other stuff