wip. Second attempt on markNeeded. Sample{Server,Client} almost work now...