Prep animation, improve module references.