Almost done JSON re-write