Tweaked Move Validation

Made the move validation logic make a bit more sense