With JSON file
Fixed conditionals
trying to merge
Trying to fix merge
Fixed API request and view