Should probably make this a json as well