starting refactor on animations, long road ahead