We need to future-proof this

Let me diarize this, and we can synchronise ourselves at a later timepoint drink the Kool-aid.