work in progress: refactor collection service