@mh I took the liberty of splitting out the working half of your !21 since I would like to merge that part