Made some things internal.