Totally updated Gigi's C.S. quickly. 

I haven't read through all my stuff but I think for the most part I added what is needed xD