Resolved TODO - we can elaborate when there's more to say.