modifs
add models
json tests