add anims and all
merge