animation system refactoring begins