Added snippet retrieval
Merge branch 'Amos/snippet-evaluation'