Still ping pong, more stuff added, needs a lot of to fix