Did a merge with some new but outdated animation code.