Need to add signature calculator prior to json