Worked on Self-collision and Score/End of Class