finished separating public/private