Reinforce the animation system (ie. less hardcoded)