WIP: working on changes for biobank 3.9.0

more refactoring