Task 3227: Adding Web Security Stuff - Work in progress