Revert "rest of design stuff"

This reverts commit 3f675847242c3d3fab49446f4abe3c72def3501f.