Major changes to Animal/Dog/Cat classes