Add s/// syntax, needs more work