Revert "new design good idea, but still too buggy"

This reverts commit 8db8c7165677432698edc497986e75ec79e9887c.
Revert "new design builds, but is buggy."

This reverts commit 669fc8e65f3daeda2b57b048e4841f3d2a180420.
Revert "more small changes."

This reverts commit 93a79a61ac8f0f95a984b27eaf4fca714120181d.
Revert "partway implementation of major design change"

This reverts commit c13628ce12e1dde1c581db55f901fd585e74d996.