added AnimatableEntity classMore changes to be staged