Restored ping / pong.
Finished re-implementing ping / pong