Second commit of animal-shelter