working on animations again
fixed merge conflict, working on animations again