Closes #14: New workspace model