slowly working on killing off _private.h