I am not opposed to it, and Rox does tend to steer toward complex updates with lots of different things, BUT, personally, I would rather just get the divy crap out of the way separately, and then focus on the rest in separate PRs...but by all means I will take it however she wants to deliver