WIP resolve matching blocks