Can I put that in a separate PR, where I convert all the string numbers to plain numbers? That way it won't make this PR too confusing.