We'll implement this soon but want to merge something stable to main. Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>