Class S: Work in progress

See #27