In progress commit for multi-workspace support. Tests not yet passing.