Thank you! I definitely considered that but didn't want to start on a new feature so close to the end. Good to hear that's the direction to go :)