New commands, animal selection, refactoring