Added ball - changed components a little

We had duplicate code, so modified components and added the ball