GCS Update

Incomplete. About 80% done