added animations and such