More work on animations and stats