animation refactor, break build.