Added second director, tests not all passing yet