Finishing tidying up so moves are always done using play() method