add whitelist and horrible verbosity