Good plan. I'll commit a feature branch tomorrow with the other changes and we can finish it up later. Many thanks for your help on this.