Switched animation to use NSAnimationContext