Move things into public