updating the jarv/gce branch - DO NOT MERGE