On second thoughts, this can come later in another PR, not a requirement for this PR!