More work on the model backed workspace.