Okay, seems good @kimardenmiller . Lets merge this as it works. Benefit of tests, "fearless refactoring' :+1: