More refactoring, started work on a tag extractor dialog