added the animation shim and broke some other stuff