working on the workspace feature