Add samples addressing #9

DO NOT MERGE YET. More commits are likely to come.