Revert "Revert "Yosemite-Shell""

This reverts commit 9588836d46a943afa096e1012a863d15f2549bb8.