First pass at changes and sample-by.

Need some better tests here.