More work on swap animation...