Changed code to handle dogs
Fixing merge conflict, chose dog logic