refactored to use Dino objects everywhere

still need to refactor out original dino hashes
refactored out dino hashes