PR #16: Give the facts somewhere to live