initial fork commit - hiding private stuff