Refactoring and adding Internet Permissions.
wip