Refactoring
Blocking moves and some refactoring, coded blind