@ehelms how would you feel about my doing this on a separate PR? I have some other items that are higher priority that I need to finish.