Moar refactoring - extracted common library, tried (and failed) to fix blacklist