Thanks for all the refactoring here! I feel much better about it :100: