some work on add_sample.py. More TODOs.