Began changes to work with the web services and JSON