Added a TODO for using more sophisticated animation at some point.