Security overhaul (11/46)

Security overhaul