More work on move validation