Starting work on doing waiter refresh in stages
Refresh in stages feature complete