Sample rework

Addresses #37