partway implementation of major design change
more small changes.
new design builds, but is buggy.