Now using Match utility class for handling of move processing. Commented some lines to make it more clearer what it does. Removed unused code.