Feature/merge refactor detail into donations