Updated to account for (highly experimental) custom block support