More mucking with animations
Merged