Basic final version
Merge branch 'laura_and_will'
Patching a minor bug
Animations fix