Began adding support for moves.