Committed Ball stuff

Committed ball and render stuff
did some stuff to resolve conflicts