Commented out setter methods and created constructor for JSON file
Merged Alex's changes in