Design Rework
Design Rework 2
Design Rework 3
Revert "Design Rework 3"

This reverts commit 32de06f20502033f90503dbd33aa0687e6489504.
Design Rework 3