Revert "Simplified Restaurant Application.  Made it more robust to changes and"

This reverts commit f3aa9888913576f7402e3bddd5989f9ef10d91f2.