Agreed and I might take a stab at it. Will create a new issue for that so that I don't forget. :+1: