Allow adding to the blacklist, reorganize some code.