I've also planned to make it public too. But there's enough change in this PR already...?