GCS Update 2

All fixed, all working, still considering some more changes, but
otherwise all good.