Trying to condense the add-on itself.

Implementing structures to allow whitelisting.