Move JSON API stuff into week 6