It seems to work. Block-coupled scalar transport is alive. Testing required. C++ hell