I agree and will do this on a separate branch.