Done adding and searching with Json support

Sort is not working yet.