Fixed broken merge, began collider class.