Took care of 2 more TODOs, new project and integrating with a workspace.