Started on animation
refactored animation