I’ll try to carve out some time for the re-basing either this weekend or next week.

Great.

I have not looked at the code since we spoke last, any clue as to how much has changed? Particularly with specifying options?

The basic approach is still the same. My guess is that the rebase should be quite simple.