More data fleshing out, can convert models to json now