Change to use SRP

Hacks in SRP mode without any of the other protocol changes.