New assets, set up new anim code
fixed merge