More changes, working output, about to add GCS.