more work on S1 + S2

not done yet...