[WIP] Work in progress commit (workspace)