reverted last 4 and took out big json file
fixed conflict