Refactoring the workspace to incorporate the GridRunner code
Refactoring workspace some more