Added back some changes that were overriden. Also added some files that were not previously committed but seem to be required.