Model is implemented and uses json to populate data
Merged from master