Twofactor changes to take services
Updates for working two factor providers
Add options and cleanup sugar
Switch DPAPI to use options