Can we keep this as-is for now so that we can keep moving forward and revisit it at a later date?

I can add a TODO comment so we remember to get back to it.