Reverted back to original VIC and finished the GFS backend