Second Commit

Security Cleanup
Commit 3