Add workspace menu and start plumbing in