Introduced a Builder and started soft refactor of configuration stuff.  Lots to be done.
Fixed imports
Fix conflicts