Finished json update. Redid menus.
Fixed merge conflict.