Security update

Still in process but I want to show you the changes before you go away on vacation.
To make a singleton, convert to Spring bean?