moved disambiguation logic to a model file, added evaluation questions & rake for running