Implement [this part](https://docs.google.com/document/d/1PryaYgnK8MeV2Zb_1Arp0HxSvRa7TJCjxGhTWGOVQ8s/edit?tab=t.0) of the design doc
Implement this part of the design doc