First part of a big change over to GenericSecurity
MAJOR change to swap over to using GenericSecuirty library