Builder almost done.
Merged Builder and Core.