Revert "Revert "Initial with new design""

This reverts commit e770740a1c4958236eee5a8ca9856470c803bd1f.