GCS Update

Started working on the GCS subselectors, everything might or might not
be broken, possible fix coming soon.