Lots of changes to mirror current workspace.