Eric is up to date with STG

Eric files have been merged with Staging.