cut old code, Added tests.
yay, rule of 2 works
I wonder if we'll lose workspace.xml again.