Workspace

This branch implements sigMcUnc and does some refactoring.