I don't disagree. 

Also understand if you want to leave that for a separate PR.