Moving the conditional wait stuff to a new chapter. Renamed some of the classes.