Added a Workspace; minor refactor.