Feature/v1.1

Update to JSON and templates