I haven’t looked too closely, as I definitely don’t have much context on the code to suggest improvements, but the idea looks great to me 🙂