Finishing Work on OPTICS

Still need to compute goodness