Commiting last minute changes before branching off to try different implementation of AnimationComponent.