More work on the initial workspace