adding swap(move)
Adding animations...