Pull in changes
Add core
Update
Fixed makefile to reference new build
Merged in core