For ENG-6546, last few bits to connect things together