[WIP] Feature/workspace 2 webspace