To be clear, this is what we ended up doing