Roll-forward vision

[vdikov]

Roll foward the changes we reverted in #103

[cuttestkittensrule]

I rebased the changes in this PR onto main, as it seems like before this PR was to stefan/bloomhouse_2026-3-22, but that got merged into main.
Here is the command that I used:

git rebase HEAD^ --onto 75b4190

HEAD^ is the commit that this is based of (commit 30f76fa). Basically, what this is doing is re-commiting everything that was done off of stefan/bloomhouse_2026-3-22, but instead of doing it off of the same commit, --onto tells it to apply the commits onto a specific git ref. Here, I used the commit sha of the merged stefan/bloomhouse_2026-3-22.