Refactored BlockMatcher
Working on trying to fix matching
got block colors working