TrueBrain TODO: this PR needs splitting up in several commits