Added Animal class, adjust some drawing functionality