Backup

More JSON stuff and some typedef renaming