Made some public stuff internal that shouldn't  have been public