Added in JSON template and finished up basics