Pre gold commit

huge changes