Spacing
Add Surrogate version
Move spec up so extra setup isn't needed
Add version that moves spec up
Fix up tokens in old versions
Add version that uses result class