Revert "Functional Design work in progress"

This reverts commit 22fc8f54ebfc2391363fd950699215a63e0068f0.