Part way through many-to-one refactor