Security

Need to talk with @Vagabond about new security related features.