All done except need to clarify behavior for assigning projects and refactor Unit Tests.