E-Waiter
Revert "E-Waiter"

This reverts commit 7d195f70263e38692c955ed832ffa4868cc047e1.
Revert "Revert "E-Waiter""

This reverts commit 26d921d51a9b9c9094e76fd0a4cdb8e358452990.