Added basic movement and swap functionality.