Will's salesforce plugin changes - needs testing.

ahh snap