Animations still broken. Can get into weird state