Makes sense. I'll let you assess whether or not it's worth the effort. If so I'm fine just merging this PR in and taking care of the second part later this week.