initial updates to support breaking out the library