Jon: Clean up and bringing in org.json library.