WG versions -03 and -04

Draft of -05, not yet submitted, will change before submission.