refactor server and model use from waiters apps