Good point. I'll do another pass to check that things are correctly public/private.