Did stuff
Implemented LightPoint
Merge