Loads of changes.. PingPong need to be fixed