ENH: ETa extraction tools
Merge branch 'eta-extraction-tools'