Re-adding joe as non-separate project.