Part way through domain repository