partial commit -- core builds