Attempt to move the animation system to a more correct implementation, rather than using object properties. Incomplete and breaks functionality