move animation stuff back to where it was, todo