pushed management of workspace out to main