Adding in completion animations, plus some renaming.