[WIP] Fix XBlock to work with the workbench