WIP: Add more samples.