Maybe, just maybe, reset will work now

Adding animations broke reset. These changes might have fixed it. But
probably not.