updated- works again
resolving merge conflicts
starting animation set up