I would like to make it that way, and I think I see how to do it, but I'm putting in a TODO for now.