More work on REST-less tutorial