Few changes

Merge in DWW’s code, bring back animations