Prepare first cut after refactoring
Add samples