Revert "trying out some different design ideas"

This reverts commit 941334fbe7631b5a60929eecbbcb4618889943e7.