iterator
iterator added third type of entity to iterator
iterator, waitress generalized