Kam

Merge current REST work into master
Looks fine to me as a comment.