Yes, that's a good idea.  Separate PR?