Merge recent changes, add JSON config (unused yet)