Sounds good to me. And we can leave the #FIXME as a reminder