Class S: new surround feature

See #61
Missing UT