Added amazon object finder logic
Merger evan's changes