JSON format good, need to change target values and clean up