WIP adding ping pong