cool anim
Merge branch 'ani_refactor'
resolved stupid cinflicts