Related to #111. Pulled subview code out of animation.