Security overhaul (16/46)

Security overhaul