Makes it all better...
Revert "Simplified sandwich model + removed plate"

This reverts commit fa32e2fc034a89d675fa0b8ed468b37c30584ec3.