But hopefully the new features that Jan is adding will speed that up

Actually, I can probably get you a patch for this tonight to try.