* move organisation questions to be first * fix tests * fix tests after merge * document this function * explicitly write out years for clarity