re-did json and template setup