modified models and net to reflect our new data model, and added JSONParser file