Now passing tests. Better info lazy loading.