Add test data and make new model code work. Also start on json api