Added basic animal class, some fixes