Refactor, reintroduce animation.