Revert "Revert "Mockups initial""

This reverts commit eb9910d9df3c64b9c7b6a7a37b09fa48e003282d.