Separating out the handlers.  Adding a ring_wait.